Merge branch 'VS2017CI' into 'master'

Vs2017 ci

See merge request !30
6 jobs for master in 6 minutes and 29 seconds (queued for 1 second)