am 187e683a: Merge "Fix a bug with some text fields" into jb-mr1.1-dev

* commit '187e683aea117fde1ad2de2d0cdd18c3fd4ce7f4':
  Fix a bug with some text fields