Merge branch 'pseudophrase-conversion'