Last update before release
Merge branch 'release-1.0' into develop