prep for thumbnailer library extraction
Merge origin/master