Merge pull request #353 from melissalinkert/yet-another-photoshop-tiff-fix

Photoshop TIFF: ignore layers if the channel count is wrong
Merge pull request #352 from melissalinkert/slidebook-tiff

Add reader for TIFF files produced by Slidebook
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating 03770c0..6bbd9b7

Generated by OMERO-merge-stable#135 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-stable/135/)