Prepare for release 2.5.4
Release 2.4.5
Merge branch 'release/2.5.4'
Update to latest version from master (2.6.0-SNAPSHOT)