Merge branch 'master' into my-copy

Conflicts:

proximity.xcodeproj/project.xcworkspace/xcuserdata/RAJESHGUPTA.xcuserdat
ad/UserInterfaceState.xcuserstate