Ginger 1.3 bkp

Patches submitted and reviewed by community during Ginger's maintainer vacation.