Merge branch 'makefile-missing-comment' into release-3.1