Removed: MySQL 5.1 and therefore MariaDB 5.3 support (no longer supported by PhpMyAdmin)
Merge branch 'stable' into upstream-master

Conflicts:
	CHANGELOG
Updated 1.1.x CHANGELOG