Work from master and display version from release #7

Merged bdonneaux merged 2 commits into DEVops:master from DEVops:devel_bear on 24 Jul 2018
2018-07-24
@Benoit Donneaux
Work from master branch from now ...
Benoit Donneaux committed on 24 Jul 2018
@Benoit Donneaux
Display version from release branch ...
Benoit Donneaux committed on 24 Jul 2018