More Swift fiddling.
I overlooked something…
Merge branch 'master' into Xcode6