[Debug] Fixing a php 5.4 error where you can't ob_clean() if there are no output buffers that exist
Merge branch '2.1' of git://github.com/ppi/framework into 2.1