Merge pull request #10819 from raleeper/adobepass