meteor/meteor — pull request #1486 by mcbain (2013-10-11 07:20:06+00:00)
Title: Merge pull request #1 from meteor/shark

rebase