Merge branch 'master' of https://github.com/AFNetworking/AFNetworking

Conflicts:
	AFNetworking/AFURLSessionManager.m