Merge improvements into v2
Basically: Merge master in, then change DisasterRouter back to v2.
When reviewing, make sure everything looks okay (esp. in DisasterRouter) - but you don't have to review every single line as those were already reviewed when going into master. Also make sure all improvements (ticket #500) are included.