BUMP 1.5.8
Back to dev
Merge branch 'v1.5'