Catch-up merge from master to branch/2013-05-17/emergency
Remove unused variable oldSize.