bumbed version number
Merge branch 'release/0.15.4' into develop