Merge branch 'submoduleupdate'
Set font size for gvim.
Merge branch 'master' into submoduleupdate