Merge gtk-stable and master branch.