Update version.
Merge branch 'release/1.5.4' into develop