Pull in changes from #2340
Merge branch '3.8.x'

Conflicts:
	.gitignore
	lib/model.js