'update to jellybean2 branch'