Merge branch 'master' of https://github.com/slively/hubba
Merge branch 'master' of https://github.com/slively/hubba