Updated to version 2.5.
Merge branch 'master' into release