Merge remote-tracking branch 'uclouvain/master' into coc-qcc