merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 752 (Integrate cpp fixture changes into develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 756 (FS path changes (post-PR669 discussion))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 752 JesseCorrington 'Integrate cpp fixture changes into develop'
  # PR 756 mtbc 'FS path changes (post-PR669 discussion)'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 342 melissalinkert 'setId performance improvements'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 374 melissalinkert 'Add method to retrieve the significant directory count'
  # PR 378 rleigh-dundee 'Sprint5 bug fixes (develop)'
  # PR 380 ximenesuk 'Removing ndpi from readers list for fs demo'
  # PR 384 melissalinkert 'Imaris HDF: make the optimal tile size be more tile-shaped'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 256 hflynn 'Developer doc tidy 3 rebased'

Generated by SCC-merge#158 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/158/)