Hapi 3.x
Merge remote-tracking branch 'origin/hapi-3'