Code

Merge branch 'maint-1.7.9' into maint