Merging the 1.0 release into master