Make scope default to system scope rather than crashing here
Merge branch 'master' into tp-2.4.0-sparql