patch: gmx466
Merge branch 'v2.1' of github.com:plumed/plumed2 into v2.1