Merge change 1109

* changes:
  Another fix: look at db version to determine if there is a type column.