update database to latest upstream 2.2.1

Resubmitted to master from #85