Start merging of the 1.5 branch into trunk. Start with doc