Merge pull request #950 from ffried/swift-3.1-branch