Merge pull request #456 from strawd/bug7079