Pre-merge of Install-AFNetworkin branch