merge dev_4_4 -D org -I include -E exclude: PR 607 (Minor defensive programming changes for TIFF-based formats (rebased onto dev_4_4))