Update README and NOTICE files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.txt