Merge pull request #13669 from bmwiedemann/master