Upstream release to 2.6.0