Checking if the DNS query returned a valid IP when saving a Machine
Merge branch 'hot-fixes'
Merge branch 'master' into hot-fixes