Merge "Worked around hash path inconsistency to unbreak stash file thumbs."