am 8ed81f9f: resolved conflicts for merge of 8e9385cc to master

* commit '8ed81f9fd74d648fe0adc9ffc0bd2d247105ebe5':
  Only do double-space-period on real text fields.