Revert "Revert "Revert "Merge branch 'master' of https://github.com/ColdPain/darwin"""

This reverts commit a3402f46c1ce2ed77aa434cf1d80e48572a1c1cd.