Merged in change to plain-text