Commit message by Otto Kruse.

CU later