Update dependencies for bug fixes

(cherry picked from commit 6702ed1550723d995c14f0a3c2f49ac3eab9df14)
Merge branch '2.0' into 2.0-geezer

Conflicts:
	package.json