Minor post-merge clean up.
Merge remote-tracking branch 'origin/master'