Merge branch '5614-workbench-optimize-combine-collections-wip'
authorBrett Smith <brett@curoverse.com>
Mon, 13 Apr 2015 17:21:15 +0000 (13:21 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 13 Apr 2015 17:21:35 +0000 (13:21 -0400)
Refs #5614, #4943.  Closes #5686.


Trivial merge