Merge branch '1.0'

Some more variation between petals