Merge branch 'master' of ssh://sunjammer.sugarlabs.org/~/public_git/mandelwow