Merge pull request #1734 from thess/madplay-build