Merge pull request #878 from tritao/master