Merge remote-tracking branch 'uclouvain/master'
authormayeut <mayeut@users.noreply.github.com>
Sun, 3 Jan 2016 01:09:04 +0000 (02:09 +0100)
committermayeut <mayeut@users.noreply.github.com>
Sun, 3 Jan 2016 01:09:04 +0000 (02:09 +0100)

Trivial merge