merge meteor branch into master branch