Merge remote-tracking branch 'vdemeester/master' into vim-7.2