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