version 2.1.0
Merge branch 'master' of github.com:hapijs/tv

Merge upstream