Merge branch 'tester' into afnetworking2.0