Merge commit 'f20d5ca358d3957c006242df0c8c04ec09cad910' into HEAD
Merge branch 'master' of https://github.com/vertilon/beaker