Bumping version to 1.5.4
Merge branch 'release-1.5.4' into develop

* release-1.5.4:
  Bumping version to 1.5.4