Second attempt fixing save config funtion. Untested
Merge branch 'dutch-pistachitos' into dutch-tpb