Simplify build matrix
Merge pull request #966 from FabioBatSilva/simplify-build

Simplify build matrix