GTK merge of trunk code.