Merge branch 'dev'
tests updated to 1.5.1
Merge branch 'quickfix' into dev