Extraction of versions into properties
Merge remote-tracking branch 'upstream/master'