Typo (CHANGELOG)
Typo (CHANGELOG)
Typo (CHANGELOG)
Merge branch '1.1.x' into stable

Conflicts:
	CHANGELOG