minor cleanup. minor enhancements. Finish file housekeeping. add Bug 682586 fix from Mark van Doesburg.
Attach a file by drag & drop or click to upload
