Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj
Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj
Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj
Move dbcore into libs/
Merge pull request #1164 from ESwordTheCat/riW3nfAj

Move dbcore to libs/