This got merged upstream for a long time ago. Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de>