merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 203 (9993 fix develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 204 (Add note about libjpeg for PIL)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 205 (Fix typo and broken links. (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating 2e32665..66b4162
Merged PRs:
  # PR 203 hflynn '9993 fix develop'
  # PR 204 ehrenfeu 'Add note about libjpeg for PIL'
  # PR 205 jburel 'Fix typo and broken links. (rebased onto develop)'

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