Bumped version to 1.5.4.
Merge branch 'release/v1.5.4' into develop