Albert's changes
Merge branch '4.2' of github.com:UPCnet/genweb.core into 4.2