PHP Notices (ZERO Tolerance) :-)
Merge remote-tracking branch 'origin/master'