Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Fix Refs
Merge pull request #1542 from galthaus/pull-req-release-rails3anddb-openstack-os-build-da8594d2b5

Fix refs [3/4]