misc
Merge branch 'master' of github.com:hapijs/hapi