Auto-Merge pull request #2941 from octo/backport/01cf776