Merge branch 'releases/v13' of ssh://cvs.ou.linutronix.de/people/rw/ubi-cp into fastmap/v13