BUMP 1.5.4
Back to -dev.
Merge branch 'v1.5'