Merge pull request #1225 from strawd/bug22307