Merge branch 'master' into qmmm

Conflicts:
	src/gromacs/mdlib/sim_util.c

Change-Id: I807dc7b5bfb556711afbfd12b7e55443065363ee
Merge branch 'qmmm' of ssh://gerrit.gromacs.org:29418/gromacs into qmmm