Merge branch '11507-deleted-bufferblocks' refs #11507
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 25 Apr 2017 15:58:34 +0000 (11:58 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 25 Apr 2017 15:58:34 +0000 (11:58 -0400)

Trivial merge