Fix for build farm
Merge pull request #1255 from davetcoleman/master

Fix for build farm