Add mapping for use Y as y$
Merge branch 'master' into mac