Merge remote-tracking branch 'popsul/origin/gtk3' into gtk3
Clear code
Merge remote-tracking branch 'upstream/gtk3' into origin/gtk3