Oswald Buddenhagen Sat, 19 Aug 2017 04:39:43 -0700
i upstreamed this patch with an adjusted commit message.