Auto-Merge pull request #2939 from octo/pr2937-backport