subtext 1.0.2. Closes #1916
Merge branch 'master' of github.com:hapijs/hapi