* This branch takes the new v3 trunk (which basically doesn't have the v3 stuff in yet) and adds the stuff needed to compile in bb9.1 sp4+