merge pull request #1247