enable trailer downloads by default
remove local trailer config
Merge remote-tracking branch 'upstream/master'