Merge pull request #2 from nbartos/folsom/master

Merge from upstream openstack/stable/folsom