Merge branch 'master' into 9944-cwl-lockfile-packaging
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 7 Sep 2016 20:12:47 +0000 (16:12 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 7 Sep 2016 20:12:47 +0000 (16:12 -0400)

Trivial merge