Merge branch '1.0'
Bugfix
Merge branch 'master' into 1.0