Merge remote-tracking branch 'origin/master' into branch_tracking
merge master -D org: PR 152 (Add simple check for mergeable status in find_candidates())
merge master -D org: PR 153 (Add first implementation of branch tracking in `scc merge`)
merge master -D org

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

Merged PRs:
  # PR 152 sbesson 'Add simple check for mergeable status in find_candidates()'
  # PR 153 sbesson 'Add first implementation of branch tracking in `scc merge`'

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