Updates for v1.2.0 release.
Update readme.
Update readme.
Merge remote-tracking branch 'upstream/master'