more progress here
Merge remote-tracking branch 'origin/3.1' into 3.1

* origin/3.1:
  More common strings