Merge origin/master

Conflicts:
	Rules/Gen/User/UserAlbumGen.php
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master