Merge pull request #1 from meteor/devel

Trying pull changes from meteor:devel into awatson1978:devel fork