update config
Merge remote-tracking branch 'upstream/edge' into upstreamedge
Merge pull request #392 from wolfmanjm/upstreamedge

update config