Merge branch 'second-update' into the-update

Conflicts:

Utilities.xcodeproj/project.xcworkspace/xcuserdata/Developer.xcuserdatad
/UserInterfaceState.xcuserstate
Utilities/UtilString.h