Merge pull request #1 from openstack/master

123
Merge remote-tracking branch 'openstack/keystonemiddleware/master'