Cleanup.
Merge remote-tracking branch 'up/master'