Bring in latest changes from sourceforge.