Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3