Add mapping for Unite-source
Merge branch 'master' into mac