Merge "Made $timeout in BagOStuff::lock() actually work"