Merge pull request #15411 from moxiegirl/fix-links-15349

Fixes #15349 too many apis