Merge branch 'release/0.5.4'
bump RPM packaging version
Merge branch 'master' into develop