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

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