Merge pull request #2786 from sbesson/pytest_markers

Pytest markers registration
merge dev_5_0 -D org: PR 2615 (Sphinx api improvements)
merge dev_5_0 -D org: PR 2693 (Mousewheel zoom centres on mouse location)
merge dev_5_0 -D org: PR 2726 (Preview fix)
merge dev_5_0 -D org: PR 2775 (Permissions Test Matlab : Whole Suite)
merge dev_5_0 -D org: PR 2785 (Initial Dockerfile for OMERO)
merge dev_5_0 -D org: PR 2793 (Matlab CZI job)
merge dev_5_0 -D org: PR 2798 (Adv gen config)
merge dev_5_0 -D org: PR 2801 (Update dev_5_0 submodules)
merge dev_5_0 -D org: PR 2802 (Lucene Query Builder Unification)
merge dev_5_0 -D org: PR 2804 (CLI: additional fake import tests (rebased onto dev_5_0))
merge dev_5_0 -D org: PR 2808 (Show error message if group permission downgrade fails)
merge dev_5_0 -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2681 joshmoore '12252 script limit' (status: )
  # PR 2108 rleigh-dundee 'release-src includes bioformats version metadata' (label: exclude)
  # PR 2806 dominikl 'Latest changes/fixes for Insight search' (status: )
  # PR 2667 sbesson 'Add a quiet option to CLI commands' (label: exclude)
  # PR 2228 jburel 'Connection scifio' (label: exclude)
  # PR 2653 joshmoore 'Server unit tests' (status: failure)
Already up-to-date.

Merged PRs:
  # PR 2615 sbesson 'Sphinx api improvements'
  # PR 2693 will-moore 'Mousewheel zoom centres on mouse location'
  # PR 2726 jburel 'Preview fix'
  # PR 2775 bramalingam 'Permissions Test Matlab : Whole Suite'
  # PR 2785 joshmoore 'Initial Dockerfile for OMERO'
  # PR 2793 sbesson 'Matlab CZI job'
  # PR 2798 joshmoore 'Adv gen config'
  # PR 2801 snoopycrimecop 'Update dev_5_0 submodules'
  # PR 2802 joshmoore 'Lucene Query Builder Unification'
  # PR 2804 sbesson 'CLI: additional fake import tests (rebased onto dev_5_0)'
  # PR 2808 dominikl 'Show error message if group permission downgrade fails'

Repository: openmicroscopy/bioformats
Already up-to-date.

Merged PRs:
  # PR 1206 sbesson 'Fix bfGetReader for empty input'
  # PR 1216 melissalinkert 'Fix Z and T size calculation for InCell 6000 data (rebased onto dev_5_0)'
  # PR 1217 melissalinkert 'FakeReader improvements, part 1 (rebased onto dev_5_0)'
  # PR 1221 melissalinkert 'Zeiss LSM: fix offset calculation for > 4GB files with SizeT > 1 (rebased onto dev_5_0)'

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

Merged PRs:
  # PR 89 bpindelski 'Avoid division by 0 in Plot Profile.'

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Merged PRs:
  # PR 866 bpindelski 'Document client requirements for in-place import on Windows.'
  # PR 868 sbesson '5.0.3: CLI documentation'
  # PR 870 joshmoore 'New search docs'
  # PR 873 mtbc 'add note about consequences of "damaging" in-place import files'
  # PR 875 sbesson 'Expand setup.py test/py.test options description'
  # PR 877 rleigh-dundee 'Update recommended PostgreSQL version to 9.2 for float bug fix'
  # PR 881 joshmoore 'Adv config example'

Generated by OME-5.0-merge-push#113 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/113/)