Fixed: Unable to upgrade to 1.1.14 (packages file is corrupted - Ubuntu Precise)
Merge branch '1.1.x' into develop

Conflicts:
	CHANGELOG
CS fixes