Squashed commit of the swift-1.1 branch.

The master branch is now for Swift and Xcode 6. You can find the old Objective-C version in the objective-c branch.