Changes
Merge branch 'master' into activesync_2_9_0

Conflicts:
	framework/ActiveSync/package.xml