Merge topic 'update_tiff_remove_cache_entries'

7ab575f6 Merge branch 'upstream-tiff' into update_tiff_remove_cache_entries
e06f4837 tiff 2016-09-19 (50a32f50)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1926