Merge remote-tracking branch 'origin/master'

Conflicts:
	AP/x86/o-g/AP_g
	AP/x86/o/AP