Bug #66840: Fix broken build when extension built separately
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #66840: Fix broken build when extension built separately