Merge pull request #656 from LogosBible/collection_lock