Fix for XCdoe 6
Merge branch 'new_branch_name'

Conflicts:
	Kiwi.xcodeproj/project.pbxproj