Fixes #439
rebased onto 8e31951a4296817df9149fe67776bd11062f10d6
I don't know what exactly happened here but the PR shows up as "empty", as if the commits were already in upstream/f33 - but they aren't. It's not a big deal though, I still found them in your fork, so I'll grab them as a patch and apply them locally.
Pull-Request has been closed by pbokoc
Fixes #439