Merge pull request #2123 from mstanleyjones/configuration_changes_backport_2.6

Backport #2116 to releases/2.6
This commit is contained in:
Derek McGowan 2017-01-03 19:42:42 -08:00 committed by GitHub
commit 1642cd85d5

File diff suppressed because it is too large Load diff