Merge branch 'text-transform'