Merge commit 'eab2645a76fa91a73d77dc25c3df2be4108ca843' into merge_korg_master