merge master -Dorg -Ssuccess-only

Repository: ome/omero-scripts
Excluded PRs:
  - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
  - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py' (status: failure)
  - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
  - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up-to-date.

Merged PRs:
  - PR 187 jburel 'Rtd'
  - PR 208 sbesson 'Add top-level Git mailmap to normalize commit author variants'

Generated by OMERO-python-superbuild-push#50 (https://snoopycrimecop-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/)