up to 3.5
Merge branch 'master' of https://github.com/jmpolitzer/discover-meteor