Merge remote-tracking branch 'origin/master' into support_external_cartridges
Remove last external reference