Merge remote-tracking branch 'origin/master'
One more time, but with feeling.