Merge branch '10795-get-zero-block'
authorTom Clegg <tom@curoverse.com>
Tue, 3 Jan 2017 21:40:11 +0000 (16:40 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 3 Jan 2017 21:40:11 +0000 (16:40 -0500)
refs #10795


Trivial merge