swift

885b564b - Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines