Merge pull request #1 from FOSS-Cloud/master

Merge branch 1.2 and master
Merge pull request #2 from FOSS-Cloud/1.2

Merge pull request #1 from FOSS-Cloud/master