Merge branch release-2016

Change-Id: I0c8c02d4fbd56042ad77e7b646323b2570d06c7c

diff --cc docs/dev-manual/build-system.rst
Simple merge

diff --cc src/gromacs/gmxana/gmx_disre.cpp
Simple merge

diff --cc src/gromacs/mdlib/force.cpp
Simple merge

diff --cc src/gromacs/mdlib/minimize.cpp
Simple merge