A clone of https://code.launchpad.net/~gala-dev/gala/trunk r404 with Super