Fixed bug in memory reporting.
Merge branch 'test' into dev