Merge branch 'upstream' (early part) into geshi

Conflicts:
	markdown.php
Repair faulty merges