Try again to fix settings crash
Merge remote-tracking branch 'pz/master'