Merge branch 'KaoriYa' into MacVim