LITLE FIX: solving issue for php 5.4.x version that have E_STRICT standard enabled by default
Merge remote-tracking branch 'upstream/master'