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

STABLE MERGE COMMIT for SWIFT-3.1-branch