opinkerfi/adagios — pull request #434 by titilambert (2014-10-13 20:25:40+00:00)
Title: Merging upstream

Hello !

I tried to merge our work with yours !
...
I know, this is a huuuuuge commit, but please take a look ! PLEASE :)