Merge remote-tracking branch 'upstream/master'
gtk2: warning: cr may be uninitialized
Merge branch 'may_be_uninitialized'
Merge branch 'master' of github.com:dnk/mate-desktop