Yesterday
Merge from egghunt_invis_fix