d87cb794
0cd3c976
* commit 'd87cb794b063c503f4d732141904bd1edd5c5914': Settings (and general) restore fixes