Version 2.6 update
Merge remote-tracking branch 'origin/mobile' into mobile

Conflicts:
	CHANGES