fixing exception in IAdmin
reset password fix
merge dev_5_0 -Dorg -Ssuccess-only: PR 2816 (Homebrew nginx)
merge dev_5_0 -Dorg -Ssuccess-only: PR 3045 (Long line wrapping (rebased onto dev_5_0))
merge dev_5_0 -Dorg -Ssuccess-only: PR 3047 (Ensure that identity request variables are UTF-8 encoded (rebased onto dev_5_0))
merge dev_5_0 -Dorg -Ssuccess-only: PR 3048 (reset password fix)
merge dev_5_0 -Dorg -Ssuccess-only

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

Merged PRs:
  # PR 2816 sbesson 'Homebrew nginx'
  # PR 3045 aleksandra-tarkowska 'Long line wrapping (rebased onto dev_5_0)'
  # PR 3047 sbesson 'Ensure that identity request variables are UTF-8 encoded (rebased onto dev_5_0)'
  # PR 3048 aleksandra-tarkowska 'reset password fix'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1346 melissalinkert 'Update version numbers to 5.0.5' (label: exclude)
Updating a7c8d26..03cddb3
Previously merged:
  # PR 1305 ctrueden 'Add support for PrairieView version 5.2 datasets'
  # PR 1341 sbesson 'Use ome.staging for Maven release deployment (rebased onto dev_5_0)'
  # PR 1333 rleigh-dundee 'doc: Work with sphinx 1.2.3 (dev_5_0)'
  # PR 1338 hflynn 'Update NIS elements viewer software link (rebased onto dev_5_0)'
  # PR 1326 hflynn 'Add 32-bit only note to QTJava (rebased onto dev_5_0)'
  # PR 1319 sbesson 'Set the Sphinx version to 1.2.2 (rebased onto dev_5_0)'
  # PR 1318 sbesson 'Update POM version numbers to 5.0.5-SNAPSHOT'

Merged PRs:
  # PR 1345 melissalinkert 'Update version history for 5.0.5'

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

Repository: openmicroscopy/ome-documentation
Updating decb655..c846ab4
Previously merged:
  # PR 982 bpindelski 'Update IIS app pool setting doc (fix #12504). (rebased onto dev_5_0)'
  # PR 979 sbesson 'Fix signature of linkAnnotation in OMERO.matlab documentation page (rebased onto dev_5_0)'

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