Merge pull request #1313 from phil-davis/patch-9
Merge remote-tracking branch 'upstream/master'