merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 328 (Sprint 4 bug fixes, part 2)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 334 (Use better schema documentation links)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 339 (Docs enhancements)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating 03770c0..f290d28
Merged PRs:
  # PR 328 melissalinkert 'Sprint 4 bug fixes, part 2'
  # PR 334 melissalinkert 'Use better schema documentation links'
  # PR 339 melissalinkert 'Docs enhancements'

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