Merge pull request #3490
7e08e29 better std::exception logging for block/undo files (Philip Kaufmann)