Merge pull request #3697 from psyborg55/master