merge master -D org: PR 181 (Try to fix intermittent SSL error in RebaseTest.has_rebased_pr())
merge master -D org

Repository: openmicroscopy/snoopycrimecop
Already up-to-date.

Merged PRs:
  # PR 181 sbesson 'Try to fix intermittent SSL error in RebaseTest.has_rebased_pr()'

Generated by SCC-merge#397 (http://ci.openmicroscopy.org/job/SCC-merge/397/)