simplify build matrix
Merge branch 'master' into file-system

* master:
  simplify build matrix