Merge pull request #2122 from mstanleyjones/configuration_changes_backport

Backport #2116 to releases/2.5
This commit is contained in:
Derek McGowan 2017-01-03 15:43:27 -08:00 committed by GitHub
commit 9bc9d212ec
1 changed files with 832 additions and 1663 deletions

File diff suppressed because it is too large Load Diff