Merge branch 'master' into feature/HOT_TREES
Merge branch 'feature/HOT_TREES' of github.com:infoforcefeed/OlegDB into feature/HOT_TREES
Revert "Stashing stuff. Was attempting to fix valgrind errors,"

This reverts commit 25e79611577f59f505a53c3365432100ffc3c01f.