Yesterday
merge from ziggurat_bleedfix