HomeClusterLabs Projects

Merge branch 'shadowstalker-master' into upstream-master