tree a22f23e5119de96611b9f1313a9d64d637b227e7
parent 666ed07cd4b11ce75f5e6fe2df182225a221f425
parent 4f6b3c8f6d5713404f3e8711362de30ae187045f
author Philippe Hausler <phausler@apple.com> 1505958778 -0700
committer Philippe Hausler <phausler@apple.com> 1505958778 -0700

Merge branch 'swift-4.0.1-branch'

# Conflicts:
#	Foundation/JSONEncoder.swift
#	Foundation/URLSession/URLSessionTask.swift