Restore the isort dependency, due to changes to vim-isort
Merge branch 'restore-isort-dependency' into develop
Changelog for version 6.4
Merge branch 'changelog-v6.4' into develop
Merge branch 'develop'