De-duplicate equivalent scope bindings.
Merge pull request #851 from tavianator/de-duplicate-scopes

De-duplicate equivalent scope bindings.
Merge remote-tracking branch 'upstream/master'