Merge branch 'format-memory-rework'
[mmh] / DATE
1 22 April 2012