Merge branch 'hotfix/1.5.1'
q@0.9.4 has an issue so going back to 0.9.3
merge 1.5.2
Merge branch 'master' into develop