Merge pull request #2693 from dellis1972/master