Force use of cache (if entry exists) when saving images to disk, fixes #189
Add missing include, reenable media actions
Try to save media files from cache
Merge remote-tracking branch 'upstream/master'