Merge origin/master

Conflicts:
	httpdocs/img/users/7e9d50acb4.jpg