Merge remote-tracking branch 'uclouvain/master' into coc-qcc
authormayeut <mayeut@users.noreply.github.com>
Thu, 30 Jul 2015 23:50:55 +0000 (01:50 +0200)
committermayeut <mayeut@users.noreply.github.com>
Thu, 30 Jul 2015 23:50:55 +0000 (01:50 +0200)

Trivial merge