Merge pull request #1588 from json-schema-org/gregsdennis/improve-scopes

Merge pull request #1588 from json-schema-org/gregsdennis/improve-scopes #561