merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 345 (Photoshop TIFF: fix offset to first layer)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating 03770c0..2ee3cd6
Merged PRs:
  # PR 345 melissalinkert 'Photoshop TIFF: fix offset to first layer'

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