Merge pull request #124 from daniel-pittman/bug/2.7.x/7991-and-4549-autoloading-for-custom-functions

Bug/2.7.x/7991 and 4549 autoloading for custom functions

Merged for the second time, because something in the murky past ate the original merge into the main tree, done by mmrobins.