The master branch is now used for v2.5 development