Fix build matrix.
Merge branch 'master' into develop