merge

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

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