#222 Fix db_update error pages
s
Merge version2.0 into 2.1