Merge branch 'tx48-devel' into karo-devel