Bamboo compatible build file
Merge origin/master