Don't rely on system setting for error_reporting level
Merge remote-tracking branch 'ptarjan/master' into release-2.4.0