Sanity check in Dispose, list might be uninitialized
Merge branch 'REWORK_Thumbnails' into EXP_20131117