add quickfix, remove folding
Merge branch 'master' into mer