Make namespace variable global
Merge remote-tracking branch 'upstream/master' into merge

* upstream/master:
  Make namespace variable global

Conflicts:
	demo/demo.js