Update how versions are generated

Part of changes made in gt-gtk
Merge branch 'master' into wip/peer

Conflicts:
	src/CMakeLists.txt