Bug fixes.
Merge commit '88b79ba165dc166de695055cab908bfca68e8632'

Conflicts:
	inventory.py