DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b  -s ours am: f5959b7  -s ours am: 1ba0a54
am: e26d4ee

* commit 'e26d4ee8f1f962ef04f469060d40ff94029a9457':
  DO NOT MERGE Don't reject "thumbnail mode" setConfig