Commit 9879e567 authored by Theo Steininger's avatar Theo Steininger

Merge branch 'master' into fight_the_power

# Conflicts:
#	nifty/field.py
#	nifty/sugar.py
parents 63da827d dd68d8d0
Pipeline #13329 passed with stage
in 6 minutes and 29 seconds