rebased onto 6d168b00e73294cec28b3b2e06562af307b7a536
rebased onto f2bd8f75663e688edf45b10bddbb204e68b1ac17
merged, thanks
Pull-Request has been closed by jhrozek