Variant fixes + removed + from setlocalversion

Conflicts:
	scripts/setlocalversion