Merge pull request #6269 from nemesisdesign/patch-1