Master now reflects 0.7dev, important bugfixes go to 0.6.x branch.