Preparing for 1.0 release.
Merge remote-tracking branch 'origin/master'