Merge branch 'master' into...

Merge branch 'master' into 'dev-16-read-write-and-create-nes-from-interpolated-experiments-providentia-it'

# Conflicts:
#   nes/load_nes.py