Merge pull request #822 from jay-hodgson/release-28

merge change from release-27