Set foldmethod=manual in .vimrc
Merge branch 'master' into hyfn