merge dev_5_0 -D org: PR 881 (Adv config example)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating afe4ce5..c1d627b
Merged PRs (fast-forward):
  # PR 884 sbesson 'Add travis_retry to sudo apt-get install commands in .travis.yml'
  # PR 870 joshmoore 'New search docs'
  # PR 875 sbesson 'Expand setup.py test/py.test options description'
  # PR 868 sbesson '5.0.3: CLI documentation'

Merged PRs:
  # PR 881 joshmoore 'Adv config example'

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