Fix bad merge from 'master' into 'next'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 5 Oct 2019 11:31:30 +0000 (13:31 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 5 Oct 2019 11:31:30 +0000 (13:31 +0200)
See 130249b90b243f0757d1b99cb1422590d63d4838


Trivial merge