Modifications
Merge branch 'master' of https://github.com/broekhuizen/windows-openstack-imaging