Created attachment 13765 [details] patch from master for 4.7
Karolin, please add to 4.7.x Thanks!
(In reply to Guenther Deschner from comment #2) Pushed to autobuild-v4-7-test.
Pushed to v4-7-test. Closing out bug report. Thanks!