updates to 2.5.0
Merge remote-tracking branch 'origin/master'