Reviewed-by: xuelei, alanb
Reviewed-by: mbykov
Make sure to grow with size => size * 2 + 2 Reviewed-by: dholmes, chegar, ohair