Merge branch 'master' into 9766-register-workflow
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 30 Aug 2016 19:12:23 +0000 (15:12 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 30 Aug 2016 19:12:23 +0000 (15:12 -0400)

Trivial merge