Merge origin/master

Conflicts:
	gallery/gallery.php