Merge pull request #1053 from david22swan/GH-cat-9