Merge branch '9912-config-yaml' closes #9912
authorTom Clegg <tom@curoverse.com>
Tue, 27 Sep 2016 20:11:22 +0000 (16:11 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 27 Sep 2016 20:11:22 +0000 (16:11 -0400)

Trivial merge