Merge commit 'refs/changes/49/81849/2' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch