Merge commit 'fc61b' into dh-1.5

Conflicts:
	web/register.php
Cherry-pick 78994e8089c6c83f647a8236d8c4177b352c533a into dh-1.5

Prepare for complicated db17df9fe91dad1def3b3f69a2b8fff47043cd83 merge.

Conflicts:
	web/members.php
	web/profile.php
	web/register.php
	web/statistics.php
Merge commit 'db17df9' into dh-1.5

This closes session 78994e8089c6c83f647a8236d8c4177b352c533a.

Conflicts:
	web/members.php
	web/profile.php
	web/register.php
	web/statistics.php
Merge remote-tracking branch 'github/dh-1.5' into dh-1.5

Conflicts:
	web/members.php
	web/profile.php
	web/register.php
	web/statistics.php