* Auto stash before merge of "log" and "hyperion-project/master" * resolve merge tool mess
* Fix: SSDP Server spec adjust - Fix: Windows 7 network overview no longer removes the Hyperion entry - Fix: The general section should be marked as global