Merge dhalperin pre-1.1 compatibility commit #1