revert back to better behaviour of folding
Merge remote-tracking branch 'github/master'