merge master -Dorg -Ssuccess-only: PR 186 (Comment on possible conflicts)
merge master -Dorg -Ssuccess-only

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

Merged PRs:
  # PR 186 manics 'Comment on possible conflicts'

Generated by SCC-merge#499 (http://ci.openmicroscopy.org/job/SCC-merge/499/)