A couple of changes to pacify old vim
Merge remote-tracking branch 'origin/master'