Gonna give VIM a chance for awhile...
Merge branch 'release/1.4.0'