Merge pull request #1196 from tritao/master