R1:ae1f52642ce1

Merge pull request #80 from jstockdale/master

[@epriestley] Sending pull request for https://secure.phabricator.com/D1108