Merge branch '4621-crunch-memory-usage'
authorTim Pierce <twp@curoverse.com>
Tue, 2 Dec 2014 21:17:26 +0000 (16:17 -0500)
committerTim Pierce <twp@curoverse.com>
Tue, 2 Dec 2014 21:17:26 +0000 (16:17 -0500)
Refs #4621.


Trivial merge