New upstream version of UPF.
New upstream version of UPF.
Merge branch 'master' into shop
Keep track on uploaded images/other files for items in Shop module.