3.8.11
Now working on 3.8.12
Merge branch '3.8.x'

Conflicts:
	package.json
Release 3.9.0 (unstable)