Nate McMaster 376a6c9953 Merge branch 'release/2.1' into release/2.2 ... \n\nCommit migrated from 2d15280464		2018-11-05 13:10:48 -08:00
src/FileProviders	Merge branch 'release/2.1' into release/2.2	2018-11-05 13:10:48 -08:00