Merge branch 'Development'
Release version 1.2
Merge branch 'master' into Development
Release 1.2 (fix
Merge branch 'master' into Development