merged from release/75
Merge pull request #13 from ens-st3/master

Vega specific code merged from release/75