updated to D 6.25
Merge branch 'd7.25'