Merge branch 'master' into dev

Conflicts:
	DatastoreAPITest/DatastoreAPITest/DSAppDelegate.m