Merge branch 'master' into fight_the_power

# Conflicts:
#	nifty/field.py
#	nifty/sugar.py
4 jobs for fight_the_power in 6 minutes and 29 seconds (queued for 1 second)