Ww2.5.1.3

update devel with teaks that have been added to ww2.5.1.3