Merge pull request #640 from ocadotechnology/dpkg_admin_lock