Merge branch 'master' of git.lxde.org:/lxde/lxpanel