PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1

cleanup and PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1
Merge branch 'pull-request/656' into PHP-5.5

* pull-request/656:
  PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 1