Bump to 3.6 final