Import as bug develop

Same as gh-1310 now on develop
See https://trac.openmicroscopy.org.uk/ome/ticket/10832 for a description of the issue.

Replaced 1357, branch was deleted by mistake.