Merge branch 'master' into '31-disorder-lattice-class'

# Conflicts:
#   src/config/mc
#   src/main.cpp
1 job for 31-disorder-lattice-class in 44 seconds