SPIP-3.0.10
Merge branch 'release' into spip

Conflicts:
	svn.revision