Rebase dev 4 4

This is the same as https://github.com/openmicroscopy/ome-documentation/pull/580. Now on dev_4_4