upstream/6.1+20180630

Sven Joachim

@joachim-guest

d3b29180 · Import upstream patch 20180630 · Jul 01, 2018

Upstream patchlevel 6.1+20180630