Merge pull request #1874 from saper/bug_29679