Merge branch 'master' into feature/entities/disk

Conflicts:
	Haneke.xcodeproj/project.pbxproj