Fix for the same old PHP 5.3 issue.
Merge remote-tracking branch 'origin/back-end-working' into back-end-working