Only define the base version number when not given on the command line.
Merge branch 'Marlin_v1' into Marlin_UM_HeatedBedUpgrade

Conflicts:
	Marlin/Configuration.h