Merge pull request #1 from openstack/master

5172013 update