Revise indent of Unite mappings
Merge branch 'master' into mac