Merge commit 'c1b54205471ea7824c87e53e0d9e6d4c30518007' into merge_korg_master