Rebased onto develop of spec clean PR

Rebase of https://github.com/openmicroscopy/openmicroscopy/pull/620