Updated meteor
Merge branch 'master' into reconfig_collections