2.05.4:schwarherz:12 Patrum Scuta remerge

put the stuff from Patrum Scuta that we actually wanted back in.