[Fix] Bamboo build.
[Fix]
Merge pull request #218 from jmpascal/MERGING-1

[Fix] Bamboo build.