Fixing issues, where PHP 5.4 tests were not passion on PHP 5.3
Merge branch 'master' into in-portal

* master:
  Fixing issues, where PHP 5.4 tests were not passion on PHP 5.3