Merge pull request #223 from dirkmueller/release/stoney/master

Fix trust backend setting