added option to use output buffering from esi_include
Merge events-fix into master