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

Not sure if I'm doing this in the correct direction, but trying not to refork my local repository.