Merging 1.0.0RC3