upstream/6.1+20191019

Sven Joachim

@joachim-guest

ea70ec81 · Import upstream patch 20191019 · Oct 20, 2019

Upstream patchlevel 6.1+20191019