Merge pull request #2619 from GregoryMorse:patch-3