Merge branch '6967-yaml-format' closes #6967
authorTom Clegg <tom@curoverse.com>
Thu, 8 Oct 2015 19:24:19 +0000 (15:24 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 8 Oct 2015 19:24:19 +0000 (15:24 -0400)

Trivial merge