ngoldman/Terraformer — pull request #1 by ngoldman (2013-01-29 02:47:56+00:00)
Title: merge from upstream

:sunglasses: