Added 1.7.9 support
Merge branch '1.7.9'