Merge remote-tracking branch 'origin/master'
authorroot <root@devel.pl.sophia.inria.fr>
Wed, 6 May 2015 17:48:17 +0000 (19:48 +0200)
committerroot <root@devel.pl.sophia.inria.fr>
Wed, 6 May 2015 17:48:17 +0000 (19:48 +0200)

Trivial merge