test1
Merge branch '1.2-pre' of https://github.com/FOSS-Cloud/vm-manager into 1.2-pre