Update meteor
Merge pull request #799 from marcandre/meteor_update

Update meteor