Merge pull request #3527 from dibdot/master