Clean up supermerge.
Merge branch 'master' into init-map