Merge branch 'hotfix-0.9.12'
update to 1.5.1 fix
Merge branch 'hotfix-0.9.13' into develop