Merge "gtk3" branch into "master".