New documentation for 2.5
Update to 2.5
Fixed configure for 2.5
Merge remote-tracking branch 'upstream/master' into cmake_support