Merge pull request #977 from jasonleenaylor/bug-18558