Cherry-pick pull request from rrutledge (#28)