Seems sane.
Commit 83967ee3 fixes this pull-request
Pull-Request has been merged by puiterwijk@redhat.com
Commit 831f814f fixes this pull-request