Merge branch 'master' into branch1

Conflicts:

proj.ios_mac/HelloWorld3.2.xcodeproj/project.xcworkspace/xcuserdata/mali
ang.xcuserdatad/UserInterfaceState.xcuserstate