Merge pull request #1027 from nethraravindran/swift-3.1-branch