synchronized to latest 1.18 trunk version from our http://synopse.info/fossil repository