Merge pull request #1538 from lorinlee/release-1.0.0-rc02