piki
Merge upstream changes from Zencephalon