Apply pull request #35 to the appropriate branch