Cleanup.
Merge branch 'master' into portable-update