rebased onto bb942cee00c5ed66e4847f37ea9881379a95ad2f
ACK
Commit 08ae90af fixes this pull-request
Pull-Request has been merged by jhrozek