Merge xaac/Gaufrette with Lexance/Gaufrette.