Merge branch 'master' of https://github.com/hahasplat1/MoultrieXODB into master-ashley
Merge branch 'master' of https://github.com/Xstract/xodb