Merge pull request #3283 from zebity/master