b
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/semantic/views/layouts/main.php