Removed the tag stuff until Travis bug is fixed
Merge branch 'master' into develop
Merge branch 'develop' into feature/mongo-failfast