Code

Addition to my previous commit: fix for trunk is a bit different from the fix for...