merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 342 (setId performance improvements)
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: PR 351 (Add SPW support to FakeReader)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 355 (Photoshop TIFF: ignore layers if the channel count is wrong (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 356 (License updates)
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating fe1a095..55b680e
Merged PRs:
  # PR 342 melissalinkert 'setId performance improvements'
  # PR 349 bpindelski 'Fix Eclipse AssumeNG errors (see #10238)'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 355 melissalinkert 'Photoshop TIFF: ignore layers if the channel count is wrong (rebased onto develop)'
  # PR 356 ctrueden 'License updates'

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