rebased onto ac50252050949d8f73b96bc1c6be9b43b2c18d99
rebased onto 5759e6e9d42ae4b9d5a55b2d3e7458b94eb9e7d1
Pull-Request has been merged by pingou