merge develop -Dorg -Ssuccess-only: PR 3069 (Scalebar)
merge develop -Dorg -Ssuccess-only: PR 3109 (Disable keyboard navigation (up, down, left, right) for jquery tabs)
merge develop -Dorg -Ssuccess-only: PR 3156 (Templates cleanup)
merge develop -Dorg -Ssuccess-only: PR 3157 (Reset password)
merge develop -Dorg -Ssuccess-only: PR 3187 (5 0 6 rebase)
merge develop -Dorg -Ssuccess-only: PR 3201 (Removed generic type from JComboBox (1.6 compliance))
merge develop -Dorg -Ssuccess-only: PR 3204 (Allow to set feedback URL via environment variable)
merge develop -Dorg -Ssuccess-only: PR 3206 (c++ green!)
merge develop -Dorg -Ssuccess-only: PR 3208 (Update the OMERO install script to test Web login with CSRF (rebased onto develop))
merge develop -Dorg -Ssuccess-only: PR 3214 (Change xfail markers to broken)
merge develop -Dorg -Ssuccess-only: PR 3218 (Units metadata panel)
merge develop -Dorg -Ssuccess-only: PR 3220 (Qa submit)
merge develop -Dorg -Ssuccess-only: PR 3221 (Wrap description text to avoid horizontal scroll bar)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 3181 joshmoore 'Update to Hibernate 3.6 (See trac2570)' (label: exclude breaking)
  # PR 3215 joshmoore '5.1DEV__16: Ordered Map implementation' (label: breaking)
  # PR 3086 will-moore 'Create image by tiling 12459' (label: exclude)
  # PR 3213 sbesson 'Flake8 OMERO.web feedback' (label: exclude)
  # PR 3098 aleksandra-tarkowska 'Metadata reimport' (label: exclude)
  # PR 3216 joshmoore 'Misc DB fixes (5.1DEV__17)' (label: exclude breaking)
  # PR 3042 will-moore 'Download dataset project' (label: exclude)
  # PR 2363 dominikl 'Java Gateway API' (label: exclude breaking)
  # PR 3000 jballanc 'Update artifacts for Lucene, Hibernate, and Spring' (user: jballanc)
  # PR 3141 dpwrussell 'jstree upgrade (Functionality Review Only)' (exclude comment)
  # PR 2585 aleksandra-tarkowska 'making time_zone and first_day_of_week configurable' (exclude comment)
  # PR 2182 joshmoore 'Read only flag' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 3069 aleksandra-tarkowska 'Scalebar'
  # PR 3109 dpwrussell 'Disable keyboard navigation (up, down, left, right) for jquery tabs'
  # PR 3156 aleksandra-tarkowska 'Templates cleanup'
  # PR 3157 jburel 'Reset password'
  # PR 3187 will-moore '5 0 6 rebase'
  # PR 3201 dominikl 'Removed generic type from JComboBox (1.6 compliance)'
  # PR 3204 sbesson 'Allow to set feedback URL via environment variable'
  # PR 3206 joshmoore 'c++ green!'
  # PR 3208 sbesson 'Update the OMERO install script to test Web login with CSRF (rebased onto develop)'
  # PR 3214 ximenesuk 'Change xfail markers to broken'
  # PR 3218 will-moore 'Units metadata panel'
  # PR 3220 jburel 'Qa submit'
  # PR 3221 dominikl 'Wrap description text to avoid horizontal scroll bar'
Conflicting PRs (not included):
  # PR 3207 will-moore 'General pane web 2'
  # PR 3217 aleksandra-tarkowska 'Viewer fixes'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (label: exclude)
  # PR 1435 joshmoore 'Ordered MapPairs implementation' (label: breaking)
  # PR 1365 ctrueden 'PrairieView 5.2 fixes and improvements' (label: exclude)
  # PR 1309 melissalinkert 'Allow tile-based access of large JPEG-2000 images' (exclude comment)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (label: exclude)
  # PR 1383 LeeKamentsky 'Fix im3 metadata' (user: LeeKamentsky)
  # PR 1177 rleigh-dundee 'specification: Add metadata for HDF5 embedding' (exclude comment)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1437 stelfrich 'Changed handling of empty series names in ND2 files' (user: stelfrich)
  # PR 1366 ctrueden 'Miscellaneous cleanup' (label: exclude)
  # PR 1161 sommerc 'Initial CellH5 Reader class' (user: sommerc)
  # PR 1426 qidane 'Initial Rendering Definitions schema' (exclude comment)
  # PR 1381 melissalinkert 'Parse physical pixel sizes from CellSens .vsi datasets' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 1362 melissalinkert 'Make FormatReader's RandomAccessInputStream transient'
  # PR 1407 melissalinkert 'TIFF: fix plane count calculation for pyramids with multiple planes'
  # PR 1420 qidane 'Updating samples and adding units samples'
  # PR 1422 melissalinkert 'Zeiss TIFF: fix used file list when expected files are missing'
  # PR 1423 melissalinkert 'TIFF: attempt to correct incorrectly stored StripByteCounts values'
  # PR 1425 jburel 'Convert tolerance to NonNegativeInt to NonNegativeFloat'
  # PR 1428 rleigh-dundee 'C++: Incremental metadata processing work'
  # PR 1431 rleigh-dundee 'Specification: Add XML catalogues for released schemas'
  # PR 1432 melissalinkert 'Metamorph: fix description delimiter to account for XML sanitization'
  # PR 1433 melissalinkert 'Initial version of I2I reader'
  # PR 1434 rleigh-dundee 'cpp: cmake: RegexChecks: Improve include usage for portability'
  # PR 1436 rleigh-dundee 'cpp: compat: Add path type lookups to module'
  # PR 1438 qidane 'Correct regex so PA = PASCAL'
  # PR 1439 sbesson 'Update Eclipse instructions for Bio-Formats with link to ome-devel thread'
  # PR 1440 melissalinkert 'DICOM: fix byte skipping for >8 bit data'
  # PR 1441 melissalinkert 'Fix OME-XML BinData decoding'
Conflicting PRs (not included):
  # PR 1418 rleigh-dundee 'IFormatReader: Remove deprecated methods'

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

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

Merged PRs:
  # PR 1037 manics 'Add OMERO-5.1-{latest,merge}-deploy-win jobs to contributing'

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