Merge remote-tracking branch 'origin/master'

# Conflicts:
#	nes/methods/horizontal_interpolation.py
in 39 seconds, using 0 compute credits, and was queued for 1 second