jwrdegoede sync with v18 upstream submission
5aba938 Nov 25, 2019
sync with v18 upstream submission
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
5aba938