Merge commit 'refs/pull/113/head' of https://github.com/Eyescale/Buildyard