Start of removing strict PHP warnings
Merge origin/master
PHP 5.4 strict standard notice elimination - phase 1
Merge origin/master