upstream update to 7.4 (yeah~)
Merge branch 'master' into myvim