Merge branch 'master' into 'harmonic_inference.py'

# Conflicts:
#   nifty/sugar.py
4 jobs for harmonic_inference.py in 6 minutes and 9 seconds