Merging modules and moving to a 6.x branch.