Merge pull request #2888 from awakecoding/master