Merge gtk-testing and gtk-stable