Merge pull request #10466 from kryptothesuperdog/master