Use command key for leaping and threshold-adjustment on macs.
Merge branch '0.11.x'