Temporarily work around misleading text on the home page.

It appears to grab the changelog from the development branch, instead
of the tag of the latest release.
(cherry picked from commit 1aacbf2f40edbe96d1ecafc6764e1fd3ccb121d6)

Conflicts:

	ChangeLog
Merge remote-tracking branch 'upstream/3.6.x' into 3.6.x_surfsara