Merge remote-tracking branch 'origin/stable' into stable

SWIFT STABLE MERGE COMMIT for swift-3.1-branch.