Merge branch 'release/rails3anddb/master' into release/rails3anddb/cloudera-os-build
Fix fres
Merge pull request #1541 from galthaus/pull-req-release-rails3anddb-cloudera-os-build-ba149d2d7a

Fix refs [2/4]