Fix default configuration regression
Merge branch 'master' into geezer