Merge remote-tracking branch 'upstream/master' into TransformIntoBundle

Conflicts:
CTAssetsPickerDemo.xcodeproj/project.pbxproj