Conflicts: configure.py database.cc (added missing include) utils/serialize.hh (added missing inlines)