TerraPass/16384 — pull request #1 by TerraPass (2014-03-21 19:24:51+00:00)
Title: Master

Mergeback to master.