[Change] went for one final Phing
Merged phing into develop
Merged develop into master