Merge pull request #1042 from jay-hodgson/release-47

merge to release-47