2.5dev - updated for the newest code in master