Merge branch 'UpdateBuildStructure' into 'master'

simplified build

See merge request !4
3 jobs for 20180705-1 in 1 minute and 14 seconds (queued for 1 second)
latest