Incorporate r147 of the original.
Merge remote-tracking branch 'origin/master'