Merge branch 'master' of https://github.com/openstack/trove
Merge branch 'master' of github.com:cweidenkeller/trove