hot fixes, increase vesrion number
Merge branch 'hotfix-1.2'