Combined changes for Meteor 0.9.0 with the other changes