Merge pull request #824 from RussellSenior/patch-2.7.3