Merge updates from lammps master