comm5-3
Merge remote-tracking branch 'origin/master'

Conflicts:
	packages/.gitignore
	smart.json
	smart.lock
comm7-2
comm7-3
comm7-3