release 3.8.15
Now working on 3.8.16
Merge branch '3.8.x'

Conflicts:
	package.json