Merge branch 'master' into 'shuo'

# Conflicts:
#   slurm/grep_current.sh
3 jobs for shuo in 8 minutes and 6 seconds (queued for 2 seconds)
latest