Fix scope redeclaration
Fixup trailing whitespace
Merge remote-tracking branch 'sdk/master'

Conflicts:
	bootstrap.js
Version 9