upd
Merge branch 'stable-1.0' into unstable