Bump to 6.1-stable