made sure cleaning the dbpath works well on osx #983
Merge branch 'merge-libs' into merge-libs-master