Merge pull request #3342 from zebity/master