Merge pull request #10085 from totten/master-assets