[pull] develop from lammps:develop#118

pull[bot] merged 6 commits intocomphy-lab:developcomphy-lab/lammps:developfrom

lammps:developlammps/lammps:developCopy head branch name to clipboard