Closes #1351
Merge branch 'master' of github.com:spumko/hapi
Merge remote-tracking branch 'upstream/master' into readme