merge dennisoderwald's 670db38 (orf97d0ad?)