Merge pull request #7888 from totten/master-api-key