Merge remote-tracking branch 'remotes/tomboy-64/sigil'