renamed Drift -> OptDrift
Merge branch 'master' of https://iagapov@github.com/iagapov/ocelot.git
Merge branch 'master' of https://iagapov@github.com/iagapov/ocelot.git