the original change broke a few tests.  I think this one is better
Merge branch 'develop' into tables

* develop:
  the original change broke a few tests.  I think this one is better