Merge remote-tracking branch 'uclouvain/master'
authormayeut <mayeut@users.noreply.github.com>
Wed, 7 Oct 2015 19:07:24 +0000 (21:07 +0200)
committermayeut <mayeut@users.noreply.github.com>
Wed, 7 Oct 2015 19:07:24 +0000 (21:07 +0200)

Trivial merge