Updated phing to version 2.5
Merge branch 'edge'

* edge:
  Updated phing to version 2.5