ffranco-daitan

@mafagafogigante @gaubert Commits quashed and rebased. Please merge :)

Yes I know you don't have commit rights, I meant to tell you I did what you asked and ask @gaubert to merge! :D