Sugar 1.0.11
Merge branch 'update' into update.linux