Fix issue with missing subbuild for a matrix job
Merge remote-tracking branch 'origin/master'