Merge fixes from internal repo
Merge branch 'master' of github.com:manymo/manymo