update
Merge commit 'a01b79b8f6816126bc05515e53e2e1faf9630a97'

* commit 'a01b79b8f6816126bc05515e53e2e1faf9630a97':
  no message

Conflicts:
	S2AppKitSamples.xcworkspace/xcshareddata/S2AppKitSamples.xccheckout