Merge pull request #2277 from sotux/master