use the auto.master.d directory by default
Merge branch 'hotfix/1.1.0'