Merge branch 'master' into next

* master:
  Fix #390: No longer depend on return value of add-row handler.
Add a TODO