Back-porting.
Back-porting some more code.
Use the copy command instead of alloc-init.
Merge branch 'master' into Xcode6

Conflicts:
	Shared/Preferences Controllers/SoundOutputController.h
	Shared/Preferences Controllers/SoundOutputController.m