Merge branch 'master' of github.com:bibsdb/bibsdb
Merge branch 'master' of github.com:bibsdb/bibsdb