Merge branch '121321' into 'master'

121321

See merge request docker/git-rsync-from-openwrt!2