Tag build swift-DEVELOPMENT-SNAPSHOT-2016-10-24-a
Merge remote-tracking branch 'origin/swift-3.1-branch' into stable

* origin/swift-3.1-branch:
  Module: correctly set the module file kind when emitting file_modified.
  Module: improve the diagnostic message for include of non-modular header.