Merge branch 'rs/use-modern-git-merge-syntax' into pu

Pat Thoyts committed Oct 3, 2016 at 23:23 UTC 9613644a310980beaaafc84f20e55520818b89b0

No changes.