Merge branch 'r300-swtcl'