Fixed buildscript for compiled dependencies
Merge remote-tracking branch 'origin'