merge master -Dorg -Ssuccess-only

Repository: ome/omero-scripts
Excluded PRs:
  - 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 223 will-moore 'don't attempt ROI stats on big images'

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

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

Author: snoopycrimecop