Merge branch '9784-update-scopes' closes #9784
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 17 Aug 2016 14:15:22 +0000 (10:15 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 17 Aug 2016 14:15:22 +0000 (10:15 -0400)

Trivial merge