Apply changes to master to gtk3 branch