ひととおりできたつもりで満足しつつ 
c3ca3801f (upstream/master) Add separate cache directory for non-local uploads (#12821)
2744f6169 Fix not being able to resolve public resources in development environment (#13505)
be637146f Fix uninformative error message when uploading unsupported image files (#13540)
c955f98d3 Fix expanded video player issues (#13541)