Patch from Mike Rylander to support load-from-file as an alternative to load-from...