Tenebrix rebased against 0.8.x