Merge IndexedDBShim with master