Fix #1991 - PHP 5.4 compliance phase 1
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into develop