Merge pull request #1025 from hflynn/inplace-rebase

Inplace import improvements (rebased)
merge dev_5_0 -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Generated by OME-5.0-merge-push#255 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/255/)