Merge pull request #3260 from awakecoding/master