Merge from OS X GTK+ branch