Fix Eclipse AssumeNG errors (see #10238)
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: PR 349 (Fix Eclipse AssumeNG errors (see #10238))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating fe1a095..e5268a8
Merged PRs:
  # PR 347 melissalinkert 'Photoshop TIFF: fix offset to first layer (rebased onto develop)'
  # PR 349 bpindelski 'Fix Eclipse AssumeNG errors (see #10238)'

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