Fix for dumping large structures
provided by Iliya Yermakov, 2012-10-28
Merge branch 'community-stable'