Move settings to role/defaults so they're easy to override
Merge remote-tracking branch 'upstream/extended' into extended