Merge remote-tracking branch 'uclouvain/master'
authormayeut <mayeut@users.noreply.github.com>
Tue, 6 Oct 2015 18:48:37 +0000 (20:48 +0200)
committermayeut <mayeut@users.noreply.github.com>
Tue, 6 Oct 2015 18:48:37 +0000 (20:48 +0200)

Trivial merge