[tor-commits] [manual/develop] Merge master