merge master -D org: PR 181 (Try to fix intermittent SSL error in RebaseTest.has_rebased_pr())
merge master -D org: PR 184 (Tracking branch with forward slash)
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()'
  # PR 184 sbesson 'Tracking branch with forward slash'

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