merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 990 (for users who have compiled isapi_wsgi on x64)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1014 (Ldap.txt: cleanup and update column names.)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating 1b9aae9..bc7edd0
Previously merged:
  # PR 1017 hflynn 'Adding server examples from questionnaire'
  # PR 1016 mtbc 'switch Jenkins links to be through secure connection'

Merged PRs:
  # PR 990 kennethgillen 'for users who have compiled isapi_wsgi on x64'
  # PR 1014 bpindelski 'Ldap.txt: cleanup and update column names.'

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