Merge branch '0.9.x' into 1.0.x

Conflicts:
	README

diff --cc EVENTS.txt
Simple merge

diff --cc README
Simple merge

diff --cc index.php
Simple merge

diff --cc lib/default.php
Simple merge