Merge remote-tracking branch 'origin/Applications/17.12'

Authored by aacid on Nov 20 2017, 1:53 PM.

Description

Merge remote-tracking branch 'origin/Applications/17.12'

Merged Changes

CommitAuthorDetailsCommitted
559836c39270D8863aacid
Give warnings when the file is modified externally 
Nov 20 2017