Merge mess
Merge upstream
Undo accidental commit
Fix typo in get_domain
Merge pull request #266 from Vanders/fix-host-inventory-263

Fix host inventory 263