Merge pull request #163 from copiousfreetime/maint/semaphore-build-machine-test