Merge origin/master

Conflicts:
	forum/messagelistupdate.php
Merge origin/master