Merge origin/gh-pages into gh-pages

Conflicts:
	CLI/cli-script-varA.js
Merge origin/gh-pages into gh-pages