merge

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