Update README.
Merge remote-tracking branch 'github/master'
Fix conflict.