More super-merge tweaks.
Merge branch 'master' into init-map