merged meteor upstream