minor tweaks
Merge remote-tracking branch 'origin/master'

Conflicts:
	.scripts/msum
Updated plugins