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