Merge remote-tracking branch 'brice/master' & rebuild