Merged v. 2.11
Merged v2.12
Merge branch 'original'

Conflicts:
	phptidy.php