Merge remote-tracking branch 'refs/remotes/github.com/master'

Conflicts:
	README.md