Merge pull request #7378
da6d18b devtools: replace github-merge with python version (Wladimir J. van der Laan)