Pull from trix - version 2.1
Pull from trix - version 2.1