Merge pull request #146 from kennknowles/backport-pr-38

Backport apache/incubator-beam#38