Stable

Merge towards 1.0 Windmill