merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 347 (Photoshop TIFF: fix offset to first layer (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating fe1a095..9fd4cd1
Merged PRs:
  # PR 347 melissalinkert 'Photoshop TIFF: fix offset to first layer (rebased onto develop)'

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