Merge commit 'refs/changes/16/124716/1' of git://gold.eng.hq.xensource.com/git/github/openstack-dev/devstack into tmpbranch