not sure why this is failing on the build machine, but not in local builds. I don't see how this would make any difference.
Merge pull request #637 from jay-hodgson/develop

Not sure why this is failing on the build machine, but not in local buil...