Merge branch 'meteor-0.6.0'