fix output buffering levels
Remove useless $app argument
Clean up a few doc blocks.
Merge branch '4.2'