Merge most of development on gromacs/master branch