This merge request accompanies xonotic-data.pk3dir!144 (merged)
Also see http://forums.xonotic.org/showthread.php?tid=5466