Rename the branch to 2.0.x to lessen confusion. Passed it by Matthias first