Merge github.com:ddurvaux/contactdb