Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
setup for permissions testing
Merge pull request #112 from mjhea0/develop

setup for permissions testing