Fixes for editshow functions.
Fix for images in cache folder being deleted by cleaner routine.
Merge remote-tracking branch 'origin/nightly' into dev