Now using a height constraint on the text view.
Merge remote-tracking branch 'origin/master'