Merge pull request #10425 from totten/master-ang-15