Merge branch 'plain' into kaudio