Merge pull request #12290 from neheb/doub