Merge remote-tracking branch 'PA/kitkat' into remix-legacy

Conflicts:
	default.xml