Closes #1299
Merge branch 'master' of github.com:spumko/hapi