Merge 'master' into 'gtk3'.