merge dev_4_4 -Dorg -Snone

Repository: openmicroscopy/snoopys-sandbox-2
Updating 33abb18..6aeac36
Previously merged:
  # PR 2 sbesson 'Add new file'

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