Load "black list" only if O+ is enabled
Merge branch 'PHP-5.5'

* PHP-5.5:
  Load "black list" only if O+ is enabled