0c1c41aeaf
Fallback to local dir when saving to media dir fails
Original-merge: f41efb3b2c
Merged-by: joshuaboniface <joshua@boniface.me>
Backported-by: Joshua M. Boniface <joshua@boniface.me>