Don't swap Command & Option by default
Merge remote-tracking branch 'upstream/master'