Prevent code folding
Merge branch 'master' into beanshell-doppio