Merge upstream svn
Merge branch 'release/1.3.1'

Conflicts:
	Changelog.txt
	readme.txt
	wp-cache-phase1.php
	wp-cache.php
	wp-super-cache.pot