ensure that the defined interpolation method is used by the generic scaling functions
Merge branch 'PHP-5.5'

* PHP-5.5:
  ensure that the defined interpolation method is used by the generic scaling functions