Attempt to fix Bamboo build possibly caused by a bug in Xcode 6.1.
Merge pull request #411 from gavincornwell/master

Attempt to fix Bamboo build possibly caused by a bug in Xcode 6.1.