Code

Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8