Squashed commit of the following:

commit 8858251b2b8f3062a616e54d8622d1dfd912d656
Author: Potsky <potsky@me.com>
Date:   Wed Jul 2 10:37:57 2014 +0200

    Le hotfix est prêt