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

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2036 joshmoore 'DSL Map Type' (exclude comment)
  # PR 2162 dominikl 'Bugfix: Image import: File naming settings were ignored' (user: dominikl)
  # PR 2160 dominikl 'Warning dialog before deletion of linked images' (user: dominikl)
  # PR 2156 jballanc 'Prevent `ServiceHandler` from retaining excess `java.io.BufferedReader` instances (see #12049)' (user: jballanc)
  # PR 1960 will-moore 'Remove cut link 11882' (user: will-moore)
  # PR 2128 jburel 'Open with develop' (label: exclude)
  # PR 2163 qidane 'New wavelength changes' (label: exclude)
  # PR 2161 aleksandra-tarkowska 'Minify viewer media' (user: aleksandra-tarkowska)
  # PR 2159 dominikl 'Renamed Cut,Copy,Paste,Unlink options (see trac #11880) (rebased onto develop)' (user: dominikl)
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users' (user: dpwrussell)
  # PR 2153 dominikl 'Bugfix: User now must set another group than 'user' (Ticket #11926)' (user: dominikl)
  # PR 2149 joshmoore 'Static build year' (user: joshmoore)
  # PR 1385 manics 'Update the OMERO VirtualBox image' (user: manics)
  # PR 2151 snoopycrimecop 'Update develop submodules' (user: snoopycrimecop)
Already up-to-date.

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

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