Merge gromacs-4-6 into master