Merge branch '10701-refactor-dispatch'
authorTom Clegg <tom@curoverse.com>
Tue, 14 Feb 2017 16:08:49 +0000 (11:08 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 14 Feb 2017 16:08:49 +0000 (11:08 -0500)
closes #10701


Trivial merge