More merge conflicts...
Merge branch 'master' of https://github.com/eoswald/hdb
Merge branch 'master' of https://github.com/eoswald/hdb
j
Merge branch 'master' of https://github.com/eoswald/hdb