Merge pull request #2579 from castillofrancodamian/wol