Yesterday
merge from batteringram_fixes