PHP 5.1 errors
Merge branch 'master' into prod