Merge branch 'origin/stable'

Conflicts:
	member.php