Merge branch '8831-crunchrunner-doc'
authorTom Clegg <tom@curoverse.com>
Mon, 25 Apr 2016 21:15:43 +0000 (17:15 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 25 Apr 2016 21:15:43 +0000 (17:15 -0400)
closes #8831


Trivial merge