merge

Repository: openmicroscopy/snoopycrimecop
Already up-to-date.
Use travis-merge from local git clone