Merge "Fix a bug in sp<> and wp<> which could cause memory corruptions" into gingerbread