Merge remote-tracking branch 'origin/master' into 1.2

3 jobs for rsync-travis-fix
in 10 minutes and 25 seconds and was queued for 0 seconds