Merge to stable 1.0