Merge pull request #4623 from dibdot/master