merge dev_5_0 -D org: PR 819 (12311 auto memory docs)
merge dev_5_0 -D org: PR 836 (Managed repository template path expansions)
merge dev_5_0 -D org

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

Merged PRs:
  # PR 819 joshmoore '12311 auto memory docs'
  # PR 836 mtbc 'Managed repository template path expansions'
Generated by OMERO-5.0-merge-push#74 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-push/74/)