change config/settings placeholder
Merge branch 'citrus'