Merge branch 'master' of github.com:spumko/hapi into v6.0
Merge branch 'v6.0' of github.com:spumko/hapi into v6.0