Repearing some broken code.
Merge branch 'master' of https://github.com/drakonbill/toto.git/
Test à la con.