Merge branch 'master' into '28-stop-criteria'

# Conflicts:
#   hypertiling/core.py
4 jobs for 28-stop-criteria in 8 minutes and 38 seconds (queued for 1 second)