(c) year update
Sync with upstream

Conflicts:
	README.md