Merge in osx-production

The OS X and Linux workers have diverged for quite some time, it's time to bring them back together.

This has the commits from #89 and therefore replaces that.