~~This is a test for centos folks, don't merge it please =)~~
They want it merged to master =)
rebased onto 751b99d7de02fff1e54ff282c27a036fa116e2b2
rebased onto ad6247f8dfe667ff83fb0ca015bb54eb997b0694
rebased onto 698eb40fb71b49e352fa7628f21beae6e16085ef
Pull-Request has been merged by pingou
~~This is a test for centos folks, don't merge it please =)~~
They want it merged to master =)