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