Merge branch 'release-1.0-alpha' into devel