Updated to v2.6