Merge pull request #3153 from zebity/master