Patches
Plain Diff
Also show a nice error when Mac address is missing instead of a PHP error issue #6124