master
Merge branch 'master' into bugfix_1_2
bugfix