Merge branch '6222-memory-status' refs #6222
authorTom Clegg <tom@curoverse.com>
Fri, 10 Jul 2015 13:32:16 +0000 (09:32 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 10 Jul 2015 13:32:16 +0000 (09:32 -0400)

Trivial merge