merge develop -Dorg -Ssuccess-only: PR 1041 (Units documentation)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating a80a912..f51326d
Previously merged:
  # PR 1057 snoopycrimecop 'Update auto-generated properties'

Merged PRs:
  # PR 1041 joshmoore 'Units documentation'

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