Merge branch 'master' into feature/js-eval

Conflicts:
	NAMESPACE
 resolve conflicts and merge upstream changes from @jcheng