Merge branch 1.0-bugfix