Merge pull request #334 from melissalinkert/schema-links

Use better schema documentation links
Merge pull request #328 from melissalinkert/sprint4.2-bug-fixes

Sprint 4 bug fixes, part 2
Merge pull request #339 from melissalinkert/docs-enhancements

Docs enhancements
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating 03770c0..2ee3cd6

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