I don't like vi mode
Merge remote-tracking branch 'gh/master'