Formatting tweaks.
Merge branch 'UM_local'
Merge branch 'master' into development