merge develop -D none -I #1742 -E breaking: PR 1742 (11591 user ip)
merge develop -D none -I #1742 -E breaking

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2083 will-moore 'Plane matrix test' (user: will-moore)
  # PR 2080 ximenesuk 'Various import and logging fixes (rebased onto develop)' (user: ximenesuk)
  # PR 2067 snoopycrimecop 'Update develop submodules' (user: snoopycrimecop)
  # PR 1956 jburel 'Login button' (user: jburel)
  # PR 2072 jburel 'User menu display' (user: jburel)
  # PR 1960 will-moore 'Remove cut link 11882' (user: will-moore)
  # PR 2051 will-moore 'Login redirects #hash. See #11957' (user: will-moore)
  # PR 2084 aleksandra-tarkowska 'adding search block to webadmin' (user: aleksandra-tarkowska)
  # PR 2036 joshmoore 'DSL Map Type' (exclude comment)
  # PR 1975 dpwrussell 'Implemented a hash on BlitzGateway objects' (user: dpwrussell)
  # PR 2081 joshmoore 'Fix dual dirs in the mac zip for insight (rebased onto develop)' (user: joshmoore)
  # PR 1385 manics 'Update the OMERO VirtualBox image' (user: manics)
  # PR 2005 mtbc 'assist #11091: refactor server DB queries for hierarchy navigation' (user: mtbc)
Already up-to-date.

Merged PRs:
  # PR 1742 aleksandra-tarkowska '11591 user ip'

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

Repository: ome/scripts
Updating 0e0ea7b..3e885a7
Merged PRs (fast-forward):
  # PR 66 sbesson 'Drop --use-mirrors from .travis.yml (rebased onto develop)'

Repository: openmicroscopy/ome-documentation
Updating 29c0fb1..84d8577
Merged PRs (fast-forward):
  # PR 655 hflynn 'removing reference to FARSIGHT tutorial re:LOCI_tools'
  # PR 652 sbesson 'Improve server-template description in advanced configuration (rebased onto develop)'
  # PR 654 joshmoore '11955 loci-tools docs (rebased onto develop)'
  # PR 650 sbesson 'Add Matlab jobs to the continuous integration page'
  # PR 645 sbesson 'Add --devel option to install the OMERO 5 via Homebrew (rebased onto develop)'
  # PR 649 sbesson 'Drop --use-mirrors from .travis.yml (rebased onto develop)'

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