Fix the release date for version 2.1.6
Merge remote-tracking branch 'origin/master' into 2.2

Conflicts:
	CHANGELOG.markdown