config update
Merge branch 'tantillus' of github.com:lajos/Marlin into tantillus