Added helper for standard scopes (see #287)
Merge remote-tracking branch 'upstream/master'