brought into sync with cerberus-python-db