Merge pull request #617.