Merge remote-tracking branch 'origin/master'
authorroot <root@devel.pl.sophia.inria.fr>
Fri, 3 Apr 2015 14:57:12 +0000 (16:57 +0200)
committerroot <root@devel.pl.sophia.inria.fr>
Fri, 3 Apr 2015 14:57:12 +0000 (16:57 +0200)

Trivial merge