Oracle mods
Merge branch 'master' of github.com:bogeblad/infoglue2