1.5 stable

update of 1.5 stable with mods from latest 1.5 development