2014-05-20 merge from new openstack-dev:master