Merge branch 'master' into origin-8442-cwl-crunch2
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 22 Jun 2016 13:57:58 +0000 (09:57 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 22 Jun 2016 13:57:58 +0000 (09:57 -0400)

Trivial merge