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 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)
Updating 824d8a2..8bf8b9f
Previously merged:
  - PR 211 JensWendt 'Solution for delimiter reading issue (ome#210) utilizing dynamic checkpoints'

Merged PRs:
  - PR 212 jburel 'add entry for Jens'

Conflicting PRs (not included):
  - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'

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

Author: snoopycrimecop