working
slide
Merge remote-tracking branch 'linas/master' into experimental

Conflicts:
	header.php
premerge
Merge branch 'experimental'