Merge pull request #896 from saiHemak/swift-3.1-branch