Merge pull request #437 from fkooman/issue-436