Name: Kendrick-SergeStinckwich.123
Author: SergeStinckwich
Time: 27 February 2013, 11:47:52.778 am
UUID: 2035b522-06ff-447c-9611-84aa2e19f753
Ancestors: Kendrick-SergeStinckwich.122

Integrate some changes from Mai Anh so the multi-host are working again.