issue #19550: can not use customer for settings
Merge pull request #90 from jrogelstad/19550

issue #19550: can not use customer for settings
Merge branch 'master' into 19453
Issue 19453: More cosmetic changes