merge dev_4_4 -D org

Repository: openmicroscopy/snoopys-sandbox-2
Already up-to-date.

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