Merge commit 'af1533d9b18042944c41f63179b886a7f988d26f'

Conflicts:
	MissionControl/MissionControl.xcodeproj/project.pbxproj