emphasize user ownership in bold
Merge pull request #786 from mtbc/rebased/develop/in-place-warning

warn that in-place ln_s can be slower for HCS (rebased from dev_5_0)
Merge pull request #795 from manics/rebased/develop/root_password_reset

Root password reset command (rebased onto develop)
merge develop -D org: PR 743 (Propose redesign of OMERO and Bio-Formats 5.0 CI jobs)
merge develop -D org: PR 782 (Custom web login 11961 (rebased onto develop))
merge develop -D org: PR 783 (document new // separator in omero.fs.repo.path (rebased from dev_5_0))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating efe82fe..8d08899
Merged PRs (fast-forward):
  # PR 795 manics 'Root password reset command (rebased onto develop)'
  # PR 786 mtbc 'warn that in-place ln_s can be slower for HCS (rebased from dev_5_0)'
  # PR 797 ximenesuk 'Add DropBox Windows requirements'

Merged PRs:
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs'
  # PR 782 will-moore 'Custom web login 11961 (rebased onto develop)'
  # PR 783 mtbc 'document new // separator in omero.fs.repo.path (rebased from dev_5_0)'

Generated by OMERO-5.1-merge-push#239 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/239/)