Merge pull request #14 from apple/master

Update swift-3.1-branch with master