Signed-off-by Olivier Fourdan <fourdan@xfce.org> #444 #436 #433 #405 (cherry picked from commit 083e6de0)
mentioned in issue #462 (closed)