Merge branch 'refs/heads/imap_sort' into private_branch
Merge branch 'refs/heads/fetch_with_indexset' into private_branch

Conflicts:
	Source/CTCoreFolder.h
	Source/CTCoreFolder.m