Merge branch 'text-direction'