Merge branch 'pg-text'