Merge pull request #1 from openstack/master

20141026merge