merge develop -D none -I breaking -E exclude: PR 2412 (Extra annotations)
merge develop -D none -I breaking -E exclude

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2435 rleigh-dundee 'cpp: RTypesI: use static locals in place of duplicated globals' (user: rleigh-dundee)
  # PR 2564 will-moore 'Top links 12326' (user: will-moore)
  # PR 2580 will-moore 'Remove 'batch_search'. See #12347' (user: will-moore)
  # PR 2583 joshmoore '12358 parse metadata' (user: joshmoore)
  # PR 2403 aleksandra-tarkowska 'Send email' (user: aleksandra-tarkowska)
  # PR 2575 jburel 'Float field (rebased onto develop)' (user: jburel)
  # PR 2411 snoopycrimecop 'Update develop submodules' (user: snoopycrimecop)
  # PR 2391 jburel 'Imagej omero (rebased onto develop)' (user: jburel)
  # PR 2510 sbesson 'Update MATLAB examples for 5.0.x (rebased onto develop)' (user: sbesson)
  # PR 2357 rleigh-dundee 'Generate Python API reference with Sphinx' (user: rleigh-dundee)
  # PR 2362 will-moore 'Remove .jy from script names' (user: will-moore)
  # PR 2571 joshmoore 'Gateway tests' (user: joshmoore)
  # PR 2455 rleigh-dundee 'Remove support for Ice 3.3' (user: rleigh-dundee)
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users' (user: dpwrussell)
  # PR 2336 knabar 'New tagging dialog' (user: knabar)
  # PR 2562 dominikl 'Rendering settings: Always show 'SavedBy' Panel' (user: dominikl)
  # PR 2559 joshmoore '12176 attach fsfiles (rebased onto develop)' (user: joshmoore)
  # PR 2256 will-moore 'Tablet drag handling' (user: will-moore)
  # PR 2560 will-moore 'for-loop fix removes 'undefined' from reset dialog. See #12301' (user: will-moore)
  # PR 2536 dominikl 'Only enable the filepath icon if there are any filepaths to show' (user: dominikl)
  # PR 2529 mtbc 'fix upgrade scripts for PostgreSQL 8.4 compatibility' (user: mtbc)
  # PR 2269 dominikl 'ROI improvements' (user: dominikl)
  # PR 2527 dominikl 'Bugfix: Remove FileAnnotations when multiple images are selected' (user: dominikl)
  # PR 2182 joshmoore 'Read only flag' (user: joshmoore)
  # PR 2521 joshmoore 'Add 'config list' command' (user: joshmoore)
  # PR 2550 dominikl 'Avoid upscaling of bird's eye image' (user: dominikl)
  # PR 2538 jburel 'Wiki format (rebased onto develop)' (user: jburel)
  # PR 2561 sbesson 'Training examples initialization script' (user: sbesson)
  # PR 2577 dominikl 'Fixed issues with AdminDialog (rebased onto develop)' (user: dominikl)
  # PR 2363 dominikl 'Java Gateway API' (status: failure)
Already up-to-date.

Merged PRs:
  # PR 2412 qidane 'Extra annotations'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1028 melissalinkert 'Large fileset performance improvements (rebased onto develop)' (user: melissalinkert)
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files' (user: melissalinkert)
  # PR 1110 sbesson 'BF docs: Jenkins cleanup (rebased onto develop)' (user: sbesson)
  # PR 983 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes (rebased onto develop)' (user: melissalinkert)
  # PR 1142 hflynn 'Add 'show and edit on Github' to docs side menu (rebased onto develop)' (user: hflynn)
  # PR 1060 melissalinkert 'Allow dist-matlab to run on Windows' (user: melissalinkert)
  # PR 1015 qidane 'Messy binary' (exclude comment)
  # PR 1145 joshmoore 'Make private class in DV reader public (see #12358)' (user: joshmoore)
  # PR 858 melissalinkert 'Initial support for Veeco AFM data' (user: melissalinkert)
  # PR 1049 melissalinkert 'DICOM: fix file grouping so that path names are normalized (rebased onto develop)' (user: melissalinkert)
  # PR 1116 rleigh-dundee 'cpp: Add TIFF support (1)' (user: rleigh-dundee)
  # PR 1070 melissalinkert 'DICOM: expand sequence reading to include known sequences (rebased onto develop)' (user: melissalinkert)
  # PR 1138 melissalinkert 'Lots of Zeiss CZI fixes (rebased onto develop)' (user: melissalinkert)
  # PR 1123 melissalinkert 'Add a reader that accepts a file containing a file pattern' (user: melissalinkert)
  # PR 981 melissalinkert 'Ignore namespaces when filling in an XMLAnnotation's Value' (user: melissalinkert)
  # PR 1108 melissalinkert 'MRC: fix handling of mode 16 data (rebased onto develop)' (user: melissalinkert)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (user: melissalinkert)
  # PR 1141 LeeKamentsky 'Reader for Amaris FlowSight .cif format' (user: LeeKamentsky)
  # PR 1135 joshmoore 'Update native-lib-loader to 2.0.1 release (rebased onto develop)' (user: joshmoore)
  # PR 1097 melissalinkert 'CellSens: fix off-by-ones in subresolution tile calculations (rebased onto develop)' (user: melissalinkert)
  # PR 1106 melissalinkert 'Imaris HDF: make sure that all resolutions have the same ZCT sizes (rebased onto develop)' (user: melissalinkert)
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 1136 melissalinkert 'Add initial support for reading BinaryOnly OME-TIFF datasets (rebased onto develop)' (user: melissalinkert)
Updating f247b30..e60b552
Merged PRs (fast-forward):
  # PR 1137 melissalinkert 'Update version history for 5.0.2 (rebased onto develop)'
  # PR 1103 melissalinkert 'Flex: fix support for new file naming scheme (rebased onto develop)'
  # PR 1092 sbesson 'Allow for a >1 count increment in B&H .sdt Files. (rebased onto develop)'
  # PR 1101 melissalinkert 'QuickTime: fix header/footer parsing bug (rebased onto develop)'
  # PR 1127 sbesson 'CI logging improvements (rebased onto develop)'
  # PR 1102 melissalinkert 'Metamorph .nd performance improvements (rebased onto develop)'
  # PR 1109 melissalinkert 'Fix memo file path creation on Windows (rebased onto develop)'
  # PR 1100 melissalinkert 'Fix single plane ND2 line scan (rebased onto develop)'
  # PR 1096 melissalinkert 'Fix 5D Imspector support (rebased onto develop)'
  # PR 1098 melissalinkert 'Gatan metadata fixes (rebased onto develop)'
  # PR 1082 rleigh-dundee 'C++: Add support for integers of different endianness'
  # PR 1120 rleigh-dundee 'cpp: ome-bioformats: Use std::complex for complex pixel types'
  # PR 1118 joshmoore 'LogbackTools: silence ClassCastException traces (rebased onto develop)'
  # PR 1128 hflynn 'Update auto-generated documentation on develop'
  # PR 1119 hflynn 'User docs tidying (rebased onto develop)'
  # PR 1099 melissalinkert 'Disable file grouping in ImageJ remote import plugin (rebased onto develop)'
  # PR 1107 melissalinkert 'Exclude log4j and packages from target-test-runner (rebased onto develop)'
  # PR 1121 sbesson 'Fix bfGetPlane tile input check (rebased onto develop)'
  # PR 1117 rleigh-dundee 'cpp: Minor doxygen fixes'
  # PR 1126 hflynn 'Leica link (rebased onto develop)'
  # PR 1083 rleigh-dundee 'make: Convert variables to ant properties'
  # PR 1075 hflynn 'Remove dead bitmap link (rebased onto develop)'
  # PR 1076 hflynn 'Adding CONTRIBUTING file to BF repo (rebased onto develop)'
  # PR 1073 rleigh-dundee 'docs: Delegate all sphinx Makefile targets to ant'

Merged PRs:
  # PR 1054 qidane 'Additional annotation points throughout the model'

Repository: ome/scripts
Excluded PRs:
  # PR 76 will-moore 'Fix 'No permissions' error in Make_Movie.py. See #12227' (user: will-moore)
Updating 31f89c4..25a0869
Merged PRs (fast-forward):
  # PR 81 will-moore 'Make movie format time 12254 (rebased onto develop)'
  # PR 84 sbesson 'Get inputs all scripts (rebased onto develop)'
  # PR 79 sbesson 'Travis fix (rebased onto develop)'

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 812 sbesson 'Remaining changes post 5.0.x job migration' (user: sbesson)
  # PR 799 manics 'Linux walkthrough (rebased onto develop)' (user: manics)
Updating be161c6..1f51804
Merged PRs (fast-forward):
  # PR 806 aleksandra-tarkowska 'Webstart template (rebased onto develop)'
  # PR 807 aleksandra-tarkowska 'ldap over ssl instruction improvement (rebased onto develop)'
  # PR 805 hflynn 'Adding contributing doc link & Zeiss link update'
  # PR 810 hflynn 'Adding example server setup page  (rebased onto develop)'
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs'
  # PR 809 sbesson 'Travis fix (rebased onto develop)'
  # PR 802 snoopycrimecop 'Update index.txt'
  # PR 801 sbesson 'Add Edit on Github button (rebased onto develop)'
  # PR 783 mtbc 'document new // separator in omero.fs.repo.path (rebased from dev_5_0)'
  # PR 782 will-moore 'Custom web login 11961 (rebased onto develop)'
  # PR 795 manics 'Root password reset command (rebased onto develop)'
  # PR 786 mtbc 'warn that in-place ln_s can be slower for HCS (rebased from dev_5_0)'
  # PR 797 ximenesuk 'Add DropBox Windows requirements'
  # PR 793 hflynn 'Ice35 support for Windows (rebased to develop)'
  # PR 791 hflynn 'Limitations update for 5.0.2 (rebased onto develop)'
  # PR 792 bpindelski 'Remove repetition of the word "files" (rebased onto develop)'
  # PR 787 manics 'Add code-signing documentation (rebased onto develop)'
  # PR 776 sbesson 'Remove all references to CI jobs in the official documentation'
  # PR 772 rleigh-dundee 'make: Convert variables to ant properties'
  # PR 771 hflynn 'Adding pyramid generation data duplication warning to in-place import (rebased onto develop)'
  # PR 760 rleigh-dundee 'Make Ice 3.4 the minimum supported version'
  # PR 768 hflynn 'Rephrasing CONTRIBUTING re: branch for PRs (rebased onto develop)'
  # PR 769 hflynn 'Making API doc links point at release version (rebased onto develop)'
  # PR 766 rleigh-dundee 'ant: Default all properties and handle empty vars in conf.py'
  # PR 758 hflynn 'Adding API doc links to OMERO docs front page (rebased onto develop)'
  # PR 759 hflynn 'ticket 10030 fix - contributing file for docs repo (rebased onto develop)'
  # PR 761 rleigh-dundee 'Delegate all Makefile targets to ant'

Generated by OMERO-5.1-breaking-push#49 (http://ci.openmicroscopy.org/job/OMERO-5.1-breaking-push/49/)