merge develop -D org: PR 898 (Cpp: Document building with cmake)
merge develop -D org: PR 914 (Documentation for network hopping for developer laptops)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Merged PRs:
  # PR 898 rleigh-dundee 'Cpp: Document building with cmake'
  # PR 914 dpwrussell 'Documentation for network hopping for developer laptops'

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