Merge remote-tracking branch 'upstream/master' into fps2

Conflicts:
	native