Merge branch 'master' into csystems
authorRafaël Bocquet <rafael.bocquet@ens.fr>
Fri, 8 Jul 2016 07:29:45 +0000 (09:29 +0200)
committerRafaël Bocquet <rafael.bocquet@ens.fr>
Fri, 8 Jul 2016 07:29:45 +0000 (09:29 +0200)

Trivial merge