tylerburton Merge pull request #34 from coregtk/3.22 …