Merge branch 'master' of https://github.com/pmichali/openstack
Increasing version number.