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

* origin/swift-3.1-branch:
  [CodeGen][ObjC] Block captures should inherit the type of the captured field in the enclosing lambda or block.