Merge pull request #110 from TheBlueMatt/2018-08-router-crashes-2