1.1: Tweak how cdrs are pulled from DB
Merge branch 'refs/heads/1.1-cdrs' into 1.1