v0.2-unstable --> v0.2-testing

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
Merge branch 'testing' into unstable

Conflicts:
	setup.py