Branched the code to 6.x-2.x properly.