Oops, forgot to check one file.
Merge branch 'master' into arc

Conflicts:
	SVGKit-iOS.xcodeproj/project.pbxproj