Merge branch '25-from-2.15.1' into 28-applydefine
change date in NEWS
Merge branch '28-applydefine' into 29