Adjust to new versioning scheme

Merged Thom Wiggers requested to merge new-versioning-scheme into master

Short description

Adjust for 1.2 scheme

Merge request reports