Map the mac command key to control
Merge commit 'd0e62980a5bf795c68f362533395bc2d3a15f9f8' into development