Merged Meteor-0.8.2 compatibility update