Closes #1388 (ugly)
Merge branch 'master' of github.com:spumko/hapi