Merge branch 'stable-2.6'

* stable-2.6:
  Gracefully fail when submit_rule/1 has no solutions
  TrivialRebase: Adapt to labels in 2.6