Merge branch 'master' into vega

Conflicts:
	lib/contrib.js