Brought in useful code from master
Whoops, overrode the old function but did not remove it
My continuing mission to explore strange but useful error messages
Fixed the old method of getting all modules to act the old way instead of the new way
Merge branch '1.8.x'