Merge branch 'embedthumb'