New mappings to resolve https://www.pivotaltracker.com/story/show/517076...

...91