Merge remote-tracking branch 'origin/master' into dont-use-docdata-for-annots…

Authored by aacid on Nov 3 2017, 2:20 PM.

Description

Merge remote-tracking branch 'origin/master' into dont-use-docdata-for-annots-and-forms

Merged Changes

CommitAuthorDetailsCommitted
f621cd0c424baacid
Add a few overrides 
Nov 3 2017