merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating 3d2a5a2..371b2ca
Previously merged:
  # PR 947 rleigh-dundee 'Cpp: Update to match the FindIce macro behaviour'

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