Merge in upstream changes from 0.97.7
[fmit.git] / README