Extension and config fixes for 3.1
Merge pull request #72 from robert-h-curry/3.1-compatibility

Extension and config fixes for 3.1