3.0.6, after git fixes