Merge pull request #5056 from logon84/master