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

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