Merge branch 'gianfar-wol-fixes'