Merge remote-tracking branch 'uclouvain/master'
authormayeut <mayeut@users.noreply.github.com>
Wed, 6 Jan 2016 16:09:14 +0000 (17:09 +0100)
committermayeut <mayeut@users.noreply.github.com>
Wed, 6 Jan 2016 16:09:14 +0000 (17:09 +0100)

Trivial merge