Merge pull request #754 from AladW/build-various