merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 224 (Training material)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 225 (Jenkins stable renaming)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating 858e9f2..1a5500a
Merged PRs:
  # PR 224 gusferguson 'Training material'
  # PR 225 sbesson 'Jenkins stable renaming'

Generated by OMERO-merge-stable#131 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-stable/131/)