Pass VERSION_EXTRA to GenerateVersion.cmake
Merge remote-tracking branch 'upstream/master' into liquid63
use_weather