fix error reporting from c3
+ minor generic fixes
Merge remote-tracking branch 'upstream/master' into upstream
Merge remote-tracking branch 'origin/upstream'
upcoming PHP 5.5 getting supported