Merge branch 'master' into fix-traceur-meteor-bugs