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

Conflicts:
	default.xml