hapi 8. Closes #12