merge dev_5_0 -Dorg -Ssuccess-only: PR 957 (OMERO developer setup  (rebased onto dev_5_0))
merge dev_5_0 -Dorg -Ssuccess-only: PR 960 (Remove brew deps in favor of brew install --only-dependencies)
merge dev_5_0 -Dorg -Ssuccess-only: PR 964 (Adding 5.0.4 to OMERO version history)
merge dev_5_0 -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating 8977d36..2aa4c16
Previously merged:
  # PR 959 hflynn 'Delete OMERO tools build info (rebased onto dev_5_0)'

Merged PRs:
  # PR 957 sbesson 'OMERO developer setup  (rebased onto dev_5_0)'
  # PR 960 sbesson 'Remove brew deps in favor of brew install --only-dependencies'
  # PR 964 hflynn 'Adding 5.0.4 to OMERO version history'

Generated by OME-5.0-merge-push#205 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/205/)