Yesterday
merge from rails_barricade_fix2