Fix for 2.5.15
Merge remote-tracking branch 'origin/master'