Merge origin/master

Conflicts:
	public_html/gallery.php