Merge branch 'lucamar-gppezzi/20160609160755_new_pr_GROMACS512' into 20160609160755_new_pr_GROMACS512