merge origin/develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy

Repository: openmicroscopy/bioformats

Repository: ome/scripts

Repository: openmicroscopy/ome-documentation

Generated by OMERO-merge-develop#520 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/520/)